Fix error in last merge from branch.
authorChong Yidong <cyd@stupidchicken.com>
Mon, 1 Nov 2010 15:18:42 +0000 (11:18 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 1 Nov 2010 15:18:42 +0000 (11:18 -0400)
commit2ef42c91767a30f3af63789325b1dbd3ffcdfbb6
tree8ff55ddf6d644635cb399b1a6b469e80b20c7897
parenta39358536901c28089cb1aa4a2da3ae5e7e78efa
Fix error in last merge from branch.
Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
not intended for trunk.
src/ChangeLog
src/dbusbind.c